* progmodes/python.el (python-shell-send-string):

(python-shell-send-string-no-output): Fix docstring.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e54619a699b8c659e4cd73ef6be4713ba9325fc..e1e02565f7a994bcce58777e012aba625e9cb8d9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-04  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+       * progmodes/python.el (python-shell-send-string):
+       (python-shell-send-string-no-output): Fix docstring (Bug#16547).
+
 2014-02-04  Anders Lindgren  <andlind@gmail.com>
 
        * emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 6058fbfe800af50eec5b2397e100c85baac530bc..6b508e03a04054d179bee887ea1d22c7f6d32a6b 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2118,8 +2118,7 @@ there for compatibility with CEDET.")
     temp-file-name))
 
 (defun python-shell-send-string (string &optional process)
-  "Send STRING to inferior Python PROCESS.
-When MSG is non-nil messages the first line of STRING."
+  "Send STRING to inferior Python PROCESS."
   (interactive "sPython command: ")
   (let ((process (or process (python-shell-get-or-create-process))))
     (if (string-match ".\n+." string)   ;Multiline.
@@ -2168,8 +2167,7 @@ detecting a prompt at the end of the buffer."
 
 (defun python-shell-send-string-no-output (string &optional process)
   "Send STRING to PROCESS and inhibit output.
-When MSG is non-nil messages the first line of STRING.  Return
-the output."
+Return the output."
   (let ((process (or process (python-shell-get-or-create-process)))
         (comint-preoutput-filter-functions
          '(python-shell-output-filter))